updated package.json, better naming

MartinKavik · Apr 13, 2019 · f4e2d81 · f4e2d81
1 parent 5847195
commit f4e2d81
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,14 +16,15 @@ cache:
 
 script:
   - yarn
+  - yarn build
   - yarn test:node
 
 env:
   - CI=true
 
 before_deploy:
   - yarn global add netlify-cli
-  - yarn build
+  - yarn build:release
 
 deploy:
   provider: script

diff --git a/index_only_css.ts → index.css_classes.ts b/index_only_css.ts → index.css_classes.ts
diff --git a/package.json b/package.json
@@ -5,14 +5,14 @@
   "repository": "",
   "license": "MIT",
   "scripts": {
-    "start": "yarn generate:rust && webpack-dev-server -d",
-    "build": "yarn generate:rust --mode=production &&  webpack --mode=production",
-    "test:node": "yarn test:base --node",
-    "test:chrome": "yarn test:base --chrome",
-    "test:firefox": "yarn test:base --firefox",
-    "test:safari": "yarn test:base --safari",
-    "test:base": "yarn generate:rust && wasm-pack test ./crate",
-    "generate:rust": "webpack --config webpack.only_css_config"
+    "generate:css_classes": "webpack --config webpack.css_classes.config --mode=development",
+    "start": "yarn generate:css_classes && webpack-dev-server -d",
+    "build": "yarn generate:css_classes && webpack --mode=development",
+    "build:release": "yarn generate:css_classes && webpack --mode=production",
+    "test:node": "wasm-pack test ./crate --node",
+    "test:chrome": "wasm-pack test ./crate --chrome",
+    "test:firefox": "wasm-pack test ./crate --firefox",
+    "test:safari": "wasm-pack test ./crate --safari"
   },
   "devDependencies": {
     "@wasm-tool/wasm-pack-plugin": "0.2.7",
@@ -23,7 +23,7 @@
     "html-webpack-plugin": "^3.2.0",
     "no-emit-webpack-plugin": "^2.0.0",
     "postcss-loader": "^3.0.0",
-    "postcss-typed-css-classes": "https://github.com/MartinKavik/postcss-typed-css-classes.git",
+    "postcss-typed-css-classes": "^0.1.0",
     "style-loader": "^0.23.1",
     "tailwindcss": "^0.7.4",
     "text-encoding": "^0.7.0",

diff --git a/postcss.config.js b/postcss.config.js
@@ -5,7 +5,8 @@ module.exports = {
     require("tailwindcss")("./tailwind.js"),
     require("postcss-typed-css-classes")({
       output_filepath: "./crate/src/generated/css_classes.rs",
-      generator: "rust"
+      generator: "rust",
+      filter: () => true
     }),
     require("autoprefixer")
   ]

diff --git a/webpack.config.js b/webpack.config.js
@@ -20,7 +20,7 @@ module.exports = {
     port: 3000
   },
   plugins: [
-    new CleanWebpackPlugin(),    
+    new CleanWebpackPlugin(),
     new HtmlWebpackPlugin({
       template: 'index.html'
     }),
@@ -29,12 +29,12 @@ module.exports = {
     }),
     // Have this example work in Edge which doesn't ship `TextEncoder` or
     // `TextDecoder` at this time.
-    new webpack.ProvidePlugin({
-      TextDecoder: ['text-encoding', 'TextDecoder'],
-      TextEncoder: ['text-encoding', 'TextEncoder']
-    }),
+    // new webpack.ProvidePlugin({
+    //   TextDecoder: ['text-encoding', 'TextDecoder'],
+    //   TextEncoder: ['text-encoding', 'TextEncoder']
+    // }),
     new CopyWebpackPlugin([
-      { 
+      {
         from: 'static',
         to: 'static'
       }
@@ -53,7 +53,7 @@ module.exports = {
             options: {
               emitFile: false,
               name: '[path][name].[ext]'
-            },            
+            },
           },
         ],
       },

diff --git a/webpack.only_css_config.js → webpack.css_classes.config.js b/webpack.only_css_config.js → webpack.css_classes.config.js
@@ -4,7 +4,7 @@ const dist = path.resolve(__dirname, "dist");
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 
 module.exports = {
-  entry: "./index_only_css.ts",
+  entry: "./index.css_classes.ts",
   output: {
     path: dist,
     filename: "bundle.js"

diff --git a/yarn.lock b/yarn.lock
@@ -3387,9 +3387,10 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-"postcss-typed-css-classes@https://github.com/MartinKavik/postcss-typed-css-classes.git":
+postcss-typed-css-classes@^0.1.0:
   version "0.1.0"
-  resolved "https://github.com/MartinKavik/postcss-typed-css-classes.git#10edfd6025e26e9ac915e5676da855ce7fad41e4"
+  resolved "https://registry.yarnpkg.com/postcss-typed-css-classes/-/postcss-typed-css-classes-0.1.0.tgz#724cb237932b8250dc85e8e6661aa96251b7edd2"
+  integrity sha512-X8y9a5XpO+WoaFLMIiDe8XwRLQjqwzg6KWBG1/SfK8aR4ljdgcy4SOPHqWzp/IGt4a5hN2HtWXibsj4FP1gCmw==
   dependencies:
     postcss "^7.0.6"
     postcss-selector-parser "^6.0.2"