Skip to content

Commit 52a488e

Browse files
committed
upd
1 parent 80fbb89 commit 52a488e

3 files changed

Lines changed: 9 additions & 29 deletions

File tree

package.json

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,10 @@
7575
"test-umdbrowser": "npm run build-browser-umd && karma start karma.umd.conf.js --single-run",
7676
"test-karma-local": "karma start karma.local_chrome.bs.conf.js && npm run build-browser-umd && karma start karma.local_chrome.umd.conf.js",
7777
"prebuild": "npm run clean",
78-
<<<<<<< HEAD
79-
"build": "npm run validate-platform-isolation && tsc --noEmit && npm run genmsg && rollup -c && cp dist/index.browser.d.ts dist/index.d.ts",
80-
"build:win": "tsc --noEmit && npm run genmsg && rollup -c && type nul > dist/optimizely.lite.es.d.ts && type nul > dist/optimizely.lite.es.min.d.ts && type nul > dist/optimizely.lite.min.d.ts",
81-
"build-browser-umd": "npm run validate-platform-isolation && tsc --noEmit && npm run genmsg && rollup -c --config-umd",
82-
=======
8378
"compile": "tsc -p tsconfig.build.json",
84-
<<<<<<< HEAD
8579
"build": "npm run validate-platform-isolation && npm run genmsg && npm run compile && rollup -c rollup.config.new.js && cp dist/index.browser.d.ts dist/index.d.ts",
8680
"build:win": "tsc --noEmit && npm run genmsg && npm run compile && rollup -c rollup.config.new.js && type nul > dist/optimizely.lite.es.d.ts && type nul > dist/optimizely.lite.es.min.d.ts && type nul > dist/optimizely.lite.min.d.ts",
8781
"build-browser-umd": "npm run compile && rollup -c rollup.config.new.js --config-umd",
88-
>>>>>>> dddfddaf (wip)
89-
=======
90-
"build": "npm run validate-platform-isolation && npm run genmsg && npm run compile && rollup -c rollup.config.mjs && cp dist/index.browser.d.ts dist/index.d.ts",
91-
"build:win": "tsc --noEmit && npm run genmsg && npm run compile && rollup -c rollup.config.mjs && type nul > dist/optimizely.lite.es.d.ts && type nul > dist/optimizely.lite.es.min.d.ts && type nul > dist/optimizely.lite.min.d.ts",
92-
"build-browser-umd": "npm run compile && rollup -c rollup.config.mjs --config-umd",
93-
>>>>>>> 7932309a (updage)
9482
"coveralls": "nyc --reporter=lcov npm test",
9583
"prepare": "npm run build",
9684
"prepublishOnly": "npm test",
@@ -121,10 +109,9 @@
121109
"devDependencies": {
122110
"@react-native-async-storage/async-storage": "^2",
123111
"@react-native-community/netinfo": "^11.3.2",
124-
"@rollup/plugin-alias": "^6.0.0",
125-
"@rollup/plugin-commonjs": "^29.0.0",
126-
"@rollup/plugin-node-resolve": "^16.0.3",
127-
"@rollup/plugin-terser": "^0.4.4",
112+
"@rollup/plugin-alias": "^3.1.9",
113+
"@rollup/plugin-commonjs": "^11.0.2",
114+
"@rollup/plugin-node-resolve": "^7.1.1",
128115
"@types/chai": "^4.2.11",
129116
"@types/mocha": "^5.2.7",
130117
"@types/nise": "^1.4.0",
@@ -157,7 +144,9 @@
157144
"nyc": "^15.0.1",
158145
"prettier": "^1.19.1",
159146
"promise-polyfill": "8.1.0",
160-
"rollup": "^4.55.1",
147+
"rollup": "2.79.2",
148+
"rollup-plugin-terser": "^5.3.0",
149+
"rollup-plugin-typescript2": "^0.27.1",
161150
"sinon": "^2.3.1",
162151
"ts-loader": "^9.3.1",
163152
"ts-node": "^8.10.2",

tsconfig.build.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
},
2828
"resolveJsonModule": true,
2929
"allowJs": true,
30-
"outDir": "./dist",
30+
"outDir": "./.build",
31+
"declarationDir": "./dist",
3132
"sourceMap": true,
3233
"skipLibCheck": true,
3334
"useUnknownInCatchVariables": false
3435
},
3536
"exclude": [
3637
"./dist",
38+
"./.build",
3739
"./lib/**/*.tests.js",
3840
"./lib/**/*.tests.ts",
3941
"./lib/**/*.spec.ts",

0 commit comments

Comments
 (0)